Fix Number/Select highlighting for corner cases