Fix favorites, prevent doubles