View renamed to Query, rework