simplified children queries, added lastSibling query builder method, updated query builder tests
simplified various queries and therefore removed custom QueryBuilder