Moved entire search process into search module