adjusted database-file and queries.