Updated HW1

Fixed the queries to work.