Update to arbitrary command opts, which need to be merged into the selector