Refactored favorites lookup