Add switch for keyword search, updated help