Add workarounds for subject details and locations