added in queries and fixed zoom issues