Fix service tabs behavior