Fix overwrite inputFilter
 Added Form Collection support