Fix for tabs in service view