Minor fine-tuning regarding form collection js handling