_distinct fixes