Added extra distinct type filter to future-proof.