Improve thesaurus detection when key is not provided.
Restrict map extent on max extent.
Merge remote-tracking branch 'origin/develop' into develop