Search by tag, will implement differently in future
Various cleanup