fixed undefined ratings
fixed undefined rating
conclude merge