Fixed when subject does not have a query