Improve Localization Handling of Forms