restore server selector behaviour