Added tag functionality. Still have to address the recent issues like search broken