Fixed problems with autoform and non-flaky collections now