359 Refactoring
360 Prepare for invalid feed items