Fixed the description and the analytics handler