completion for paths improved