Addin latest changes to form tags