Added Query to returned data for debug purposes