Redid ComboSearch

Fixed some smelly code. Made it reuse code by putting it in the
constructor.