fixes and Queries