fixup: remove option switch (active only) + add new options
context-menu, record