resolve issue #25 - added some more testcases and changed lucene index queries to achieve desired results.  Takes a while to propagate, because the indeces need to be rebuilt