Some refactoring for Employment. Fixed completed question groups not showing correctly