[enhancement] improved queries