More query fine tunning
more query fixes