*added function to search for different tags #2293
Merge branch 'develop' into feature/persistence