improved keyword search
merge fix