fix Query2 to return Image when Content is not available
fix Query9 to return Image when Content is not available
fix ordering bug in Query3 API impl
update tests according to fixes
update .csv and params files from later version of datagen