Fix classtype/entrytype/show charges issues