Added tags table to not hit cache
Merge branch 'tags-hotfix'
Merge branch 'master' into staging