Added proper tracking of selected category/calendar