- Fix search not behaving properly with default collapsed option groups
- Minor refactors