more changes to queries