this is basically the only problem I have with this patch
suppose I want to search for "foo and defs:bar"
with above in place it will just show me bar ...
so I'd relax this to IF only def field is filled in ...

still it won't be a proper solution, but until we have lucene highlighter in place ...