hard work on query builder and its further flexibility; one step further to proper siblings reordering; small fixes