Modify UpdateContainer to selection-compatiable