Bugfix: old values in template
Bugfix: removed non-existing table in query