Fixes SF bug #990307.
query string also some doc string reformatting and use of string methods instead of older string.splitfields