Follow up on share feed

See remaining comments on #568