Changes for working subdirectories with custom directory listing