Further breaking down the map query with OPTIONAL MATCH. Fixes #56