Remove some unused imports
Add tags to search-query (#789)