Bug fixes for comments retreival