Issue #639 - Write back single object if there is just one entity requested