Refactor party and fixed bug in single select selecting multiples