Replace markup mode group with xml, add smart operator