Issue 3393: fixing 500 error on tag set search caused by search changes
Merge pull request #1299 from elzj/issue_3393_tag_set_search

Issue 3393: fixing 500 error on tag set search caused by search changes