Prepare fixes for deleting feed source added manually