added tags functionality