Simplified after investigating schema and actual fields in use