rework old inline tags