Fixing query interface output to occi format

Fixes #81