STORE-230 Searching
Fix for tags
Merge pull request #435 from dshurt/master

STORE-230 Searching