Kfsti 668

This is the initial PR  for applying the KC CGB overlay project to KC 6.0. It should obviously be reviewed closely.
These just passes along the search criteria.  Should we make sure certain criteria is present or no?