This MR fixes the bug that would prevent user from picking the new
 model for operators. Logic error which would associate entities with
operator twice is also fixed.