Gunnar Morling I think it's logical, that we should also replace this sub-select

but, looking at the DAO, it basically also runs two query executions - should those be separated ?