Search by code working MIFOSX-1373
Merge pull request #985 from gauravsaini03/MIFOSX-1373

Search by code working MIFOSX-1373