Fixes issue where D7 version returns the json/array in a different structure to that of the D8+ version Closes #3389595