Add support for site-ID in Map-Notify as well