Fixes Forms, for the pre fill logic