Fix feed links

Fixed broken feed links. Simplified the code.