Search page errors when using /__search route

[bdw429s]

The search box on the top of the layout works fine since it submits to /blog/search. However, the search form at the bottom right of the page errors out as it submits to /__search. This layout doesn't implement a /layouts/search.cfm file so it uses the /layouts/pages.cfm one which assumes it's going to be included in the context of a page. The error is from CBHelper.getCurrentPage():

Application Execution Exception
Error Type: ContentBox.CBHelper.InvalidPageContext : [N/A]
Error Messages: Page not found in collection
This probably means you are trying to use the page in an non-page page! Redundant huh?

The proper solution is probably to create a dedicated search layout, but for what it's worth, I had to modify the following places for the "page" layout and "_menu" view to work when not rendering a specific contentbox page.

/views/_menu.cfm 15
<cfif !cb.isBlogView() and cb.isPageView() and event.buildLink(cb.getCurrentPage().getSlug()) eq menuItem.link><li class="active"><cfelse><li></cfif>

/layouts/pages.cfm 73
<!--- breadcrumbs only if not home page. --->
<cfif !cb.isPageView() OR cb.getCurrentPage().getSlug() NEQ cb.getHomePage()>
<div class="row-fluid">
<div class="span12">
<div class="breadcrumb">
<a href="#cb.linkHome()#">Home</a>
<cfif cb.isPageView()>
#cb.breadCrumbs(separator="<span class='divider'>/</span>")#
</cfif>
</div>
</div>
</div>
</cfif>

/layouts/pages.cfm 87
<cfif cb.isPageView() and prc.page.getNumberOfChildren()>