Refactored favourite controller