SAK-26178 map synoptic tools better