[issue-5] Changing feed to use Rewrite API to avoid double queries