Fix for add work
Handle consolidated field
Remove commented code