Patch issues regarding empty lists in resource call

Merged Martin Lowe requested to merge dev into master

Merge request reports