Refactoring tag service and APIs
Cleaning APIs for tag
Merge branch 'develop' into tag-refactor