Better use of categories - only search ones gleaned from the API call (more reliable than parsing the wikitext)