bug fixes regarding the friendship_id