Fix issues when merging Remote RSS fetch feature