Refactor. Make Contextual Webpart. Search is it's own page now.