Theme Builder

Hi, I'm pretty far behind (Confluence 2.5.1 / Theme Builder 2.0.9), finally upgrading (Confluence 3.1 / Theme Builder 4, RC for now actually). We're using the SearchBox macro

{search-box:space=MySpace}

.

Issue 1 - Moving between plain-vanilla confluence and the space's theme:
In the old world when we did a search using the search-box macro we jumped out of the theme to plain-vanilla Confluence, then when we picked a page we jumped back into Theme Builder for the specified space. In the new version when I do the same search using the same syntax my search results are displayed while still in the theme. This looks much nicer, I like it. Is this an option somewhere that can be configured? How is this happening?

Issue 2 - Macros display an error on a page where the macro cannot render properly
There are two macros at the bottom of each page. One is the TOP macro:

[#TOP]

and the other is the page-info macro:

{align:right}{page-info:tinyurl}{align}

When a user is browsing the space they render fine, but when they do a search and the search results are being displayed they turn pink to indicate they cannot be rendered correctly. In fact the Footer Bar itself turns pink. What can be done about this? Is there a way to say "if possible, render ABC but otherwise just hide yourself" to avoid this problem? Or is there a fix for it? I assume these macros are out of context or something and just don't make sense on this page, and that's ok, I just want to turn off the pink parts that indicate an error. In the old version, the search page was not rendered in the space's theme so we didn't have this problem.

Thanks for any help,
Eric