Began work on searching by tag
Merge branch 'searchbytag' (and fix some conflicts)