Adding search tags support