Merge pull request dimitri-yatsenko#26 from dimitri-yatsenko/claude/simplify-query-chapters-01TYwfu5hmSaYHnpDiKrtjXf

Simplify and merge query chapters

Author: dimitri-yatsenko