BZ-9778: Add tags filter to the queries
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap