Twewak to QueryExpression in review
Formatting of query-api
Optimized (cleanup) imports in query-api