WGS84 token fixes

Solves #627 
Note that alghouth the updateContex used "WGS84", the query results in "WGS84". Thus, we return the "right" token in the query even if the user used the "bad" token in the update. Do you think it could be a problem?