fixes for FilePath searches being broken (in QueryBuilder), cleanups, path tokenizer fixes and tests

fixes issue #9