More refactoring
small fix in feeds list
Added robustness and fixes to code
Fixed unregister link
Merge branch 'refs/heads/april_tasks' into daily_digest