Fix sintetic query composition enriched with description
to work on code that points on same table