[FOLD] SHAMap handler fixes