update some queries on front end + fix tests
61673544 fix some queries in dispatch area - part 1
Merge pull request #39 from HH-project/dev-check-queries

(#61673544) Check queries