Re-ordered some map options according to the documentation.