Fix SQL

Fix faulty SQL queries. See FAQ