Fixing issue with a null query