Fixing invalid SQL
Merge branch '28-tag-update' into staging