LB-676: Manage SMS Feeds

Quick fixes