Changed ExpertSearch to simply expert in most contexts but didn't change actual class names and such and there's no need to.
Resolved merge conflicts.