#11: Now only setting query property for 404s when there is a query available.