Fix tag search

Fixed Tag search