Better sub criteria handling.
Corrected Query multiple queries handling.
Finalized Query and Filter builders + integration tests.