Use MATCH syntax with property support.
Fixing and cleaning up.
Nicer formatting.
Merge branch '2.0.0-RC1'
Unbreaking metadata and query.