Added keyword search general search class