Full text added to entries, some spelling errors corrected, all address fields returned, even if empty
Merge remote-tracking branch 'origin/master' into json_work2