added logic for find keyword/identfier