Made favorites work. Added some more validations