Add SearchExtraNS

Change-Id: I1d5593a4cf08c3ce87b5ab4a124e690bfc717165