Some issues in WishesPage were fixed