Added changes for searching the criteria