Updates to Query to allow null value as input for query string.