Feed refactoring : Some more double click fixes