[fr] schema-system and update query-builder