Src files navigation and service tags fix