33420: complete -R/-m options and fix feature completion