Mihir,Sush | #1995 | adding search by local name