working on queries, schema changed