master: some cleanup, rewriting criteriabuilder stuff again, expect another later, other fixes and rewrites like set to list for better mapping to persistence api