Admittedly, I only took a quick look at your code, but it seems similar to one I did earlier, which you can find at Who Is/Who Was Dialog