Pre-select partner if only one is available and remove empty option