Updating OPL tag handling