New database version
Removed test strings from SQL-query
minor changes