Fix query interface result transformations