fix search to work with the new domain model