Changed query to improve zoom 10 speed