More theme spec fixes, checking for > 1000 searc results