improvements to query view