try to improve the queries