Reorganized keyword search module a bit