Significant cleanup on helper navigation of timeline, searches