Tags Search algorithm change

Tag: search algorithm change