Adjust tags for F-19 r2