Fixed Workaround for comments retrieval and added it for adding new comments