added map to index
fixed merge
server side tweaks