Added Toufic TagSearch file and appropriate adjustments