61673544 fix some queries in dispatch area - part 1