fixed some more non-thread-safe declarations in KeywordSearch module