Fixed tags parsing for class