Refine completion to go deeper than direct subdirectories