SearchRouter cleanups
Map overview fix for new layerset behavior