refactor ocl and gremlin queries to not only return strings