Remove CrudForm, fix __ prepended to index params