query selection heavily improved
the one and only query :-) included