Applying new changes in URLMapping
Updated gadget maps for compatible with new changes in URLMapper gadget