main fixes for favorites feature