modified Search business logic