fix bug in mapindex query processing; ensure all tokens are mathced