fixed local and fav bugs