Problems with template structure in Catalog

By default during theme rescan a theme folder structure is replicated on to Catalog. In general 2 things happen:

1. a section is created for every folder with a default design
2. a section is created for every template using that template as a design

Following file structure would create following url structure:

|- test_folder
|  |- sample_template.tpl
|- index.tpl

/test_folder.html - with default design
/test_folder/sample_template.html - with design from that template
/ - with design from that template

The problem is with section section, created for "test_folder" folder. Section itself is valid component for producing final url to "sample_template.tpl" template, but it isn't valid component on it's own. In most, but not all, cases intermediate folder in Catalog should not be a content page by default.

Idea #1

We can have 404 design and set it to these pages, but doing that manually in Catalog would be a nightmare.

Idea #2

We can set this 404 design by default to all created section, but in this case any page website owner creates later on would automatically display 404 instead of content block, that can be edited.

Idea #3

Also looking at section "test_folder" itself we can't tell if it's a valid CMS page or not. Maybe we can presume, that if a particular section has sub-section, then it can be accessed directly. This however is also bad idea, because average website menu item can be page on it's own and contain sub-pages within it.