Adding support for subdirectories in results.