Hot refactor

Went back and fixed quoting on collection and search which I forgot to do in the last pushes.  Sorry about that :)
My wife wishes. :-)