Fix services tabs behavior