Diagram: Unified edge editor and generic edge queries
Fixed the build