fixed some problems in UpdateEntityOperator in case where original containing element isn't best fit