Add the form set mapping, fix #2787