Merge Nashville Fixes

Merge fixes done for Nashville
Fix Genealogy

Was defaulting to a standard keyword search rather than GenealogyKeyword
searching if now search type specified