Update layout to query-engine API