optimize number of queries and bump version