Minor Product and Search cleanup. Still uncomfortable with Search