Add action to handle two different search fields
Add search select field for tags