fix broken Discovery Protocol
sort fields + change edit all behaviour