Fix #1 and fix #2: Cant select self as partner or preference (or avoid)