Refactoring Search
Merge branch 'lextech' into scottmsims

* lextech:
  Refactoring Search