Fix the keywords fetcher