Feed refactoring: Fixed bugs in Double Click Service