Added tags to the search functionality