Trying out more unified search, hopefully people find it better...