Added first/max to MappingQuery for empty qualification values