failed attempt to fix layout issues caused by adding field type and foreign-key markers