Updated handling of Auth query strings
More updates to Auth handler