Fix for the #244 bug - searching grant info
Reconfigured the parser back to the state before #318, #320; ie.
to keep edismax working on individual tokens (we have now forfeited
the multi-token synonym expansion; for most part). But this problem
requires some serious thinking. The unittest will be failing, but
this is a dirty patch...