ElbController: support for replacing/updating existing

- and various other fixes