do not add bsfilter func keys to new model
Merge branch 'fix_bsfilter_func_keys'