Added Search API & Search. | other minor changes.