Added more dynamic queries to queries2.py