Improved detection to properly look into Query Objects