Updated tag search stuff. 

Closes #30 and (mostly because of time constraints) also closes #2.