Fix counts for OmxRepository
Fix Test
Fix missing AND
Aggregates on two columns