Added logic to only report when value is present
Made suitable changes to original module also (only report on non empty response)