New tag scheme, update_feeds and tests