Fix tag search
Merge pull request #843 from josephok/v1.5.6

Fix tag search