Added tag to action forms where needed