FIX: better keyword search in parser