Update query for most popular and most recent tags to only use active marks for totals
Fixing invalid SQL
Really fixed the SQL issue this time
Merge branch '28-tag-update'