gaHighlightFeature service refactoring