Forms fix: missing checkbox, collection fix