properly mapped restore response, fix #511 #512 #513 #514 #515 #516 #517