Merge pull request #1 from KhrystynaMakar/KM-QueryBuilder

Add QueryBuid for one rule
Merge pull request #2 from KhrystynaMakar/KM-QueryBuilder

clean project directories
Build correct query with two rules