Fixed highlighting for filtered-select; minor performance improvements.