Added changes for search