Allow for null values in query properties