improve Queries