Redo merge of two keyword search files
Fix assorted issues causing compiler warnings