Adding more bug fixes for descriptions
Adding more bug fixes for descriptions