fix selection via enter key to select correct option
fix selection and highlight weirdness due to blank object being null