Core:  ALayout bugfix of wrong selection of page for layout related to a few installed templates.
Storefront:  default_html5 template minor bug fixes