improved queries