Include simplified claims within vertexes

* Also added a work around for https://github.com/orientechnologies/orientdb/issues/3273