searchTags added
Merge origin/master