Improve Query view