better handling of feed update + minor feed style