Fix EntityFormBuilder to check entity map