Really fixed the SQL issue this time
Merge branch '28-tag-update' into staging