Fixed #1 again.  Made the selector more comprehensive.