Updated form entry and tag saving