allow density for all values, use sets and maps   and remove vectors,
fix query format to be as inout format