Search experimentation and code refactor.