Fix make function so F.makeQueryString is properly able to handle input strings with "&" characters

This fixes INNOVATIONTWO-404, and possibly some other bugs.