Improve Rublev serve

[Littlezouzou]

@JNT_BA @RossSymons
Please change this for the next update