Refactoring EnquirySearch and ChildSearch into Search