ModelChanges & query fixes to match DocCode model