Added back to Keywords mode handling