adapt to sf2.2
fix validation
fixes