HW09, added queries, some view changes