Fixed an issue where favorites may not be set/unset correctly