[FIX] Calendar in filters when the widget id contains dash '_'. [DEL] Method named 'entityToKeyValue' in the controller has been deleted.