Fix multi words keywords