Even more improvements to search list generator