Filter null values on composite range queries and single prop queries