Add support for orto layer and map layer switching