refined tab completion for -r