Fix new_map response, fix index call