Improve feed queries