simplified SQL queries, added folder .metadata/