Now with working tag and tag search functionality