SITE-491: Fix for bug where sub-models not getting saved with foreign key