Keyword search viewer fix