fixed more queries to new schema