Header search, category fix, misc fixes