#253 Try to base query off of tags