Fix for more complicated queries, where we must use distinct

This need futher development to allow to choose if distinct is required and/or add named queries.