Fixed FAVORITES finally! code cleanup as well