Fix dynamic form helper data merge (by Ongo)
Fix typo in autocumplete.js by Ongo
Plan form cleanup