A few stragelers

Cleanup a few things.  One issue reported on SMF we still had as well, manual quoting of query param, could be others.  Since its in allowedto make sure I did not make any mistakes !