Fix for favorites/local storage issue