[issue-305] Check option key first for highlighting