Adding fix for when BelongsTo fields weren't specified in columns