Buddhacave issue #15 - faceted search

 - support non-null queries
 - this is a hack and should be fixed