Fix: we were loosing tokens in queries (foo:x b) -> foo:x
Added a test for crazy proximity search + commit of the latest changes in the deployment script
Aligning master with the latest fix