updated queries

according to new schema