fix working with mongoset
remove decorator
merge