improve feed discovery

2 commits from sparserss upstream project