bug fixes for deal/wish workflow