Fixes to search and to reset tags