Add more debugging details for SA Query processing