* fixed some fields issues with forms