Hierarchy Macro should also show the non Terminal Pages

Steps to reproduce:

1. Add the Hierarchy Macro with Extension Manager
2. Create some terminal and non-terminal pages having Main as a parent
3. Go to the main page (Home)
4. Edit it with WYSIWG
5. Click on Source
6. Add the following code: hierarchy space="Main" excludes="Main.WebPreferences" displayvalue="displayTitle"/
7. Click Save & View
8. Observe the results

Expected results: All the children pages of Main are shown.

Actual results: At the moment only the Terminal pages show using the Hierarchy Macro. Would be nice to also show the Non Terminal pages.