use service tags to filter declaration
Merge branch 'feature/refactor-filter-services' into develop

* feature/refactor-filter-services:
  use service tags to filter declaration