LogiQL fixes