Added search tag functionality