Fix NPE When Searching for Feeds, Workaround for Missing Root Feeds

Re-submitting the NPE fix now that @lance0428 fixed the revealed problem.

Also including a work-around patch that makes all stories not in a folder show up.