Minor fixes to String constants
Reformatted cartable columns, added isEmpty check