Search works again.  Specs needs refactor!