Refs #4 replace queryset by mapping_type only if queryset is None