Updated database creation queries
Merge remote-tracking branch 'origin/devel_tags_if' into devel