Custom forms fixes

Fixes for  #695 #906 #744 

Related to #949