Fixing some bugs with deals forms