Added code to search for a tag