Fixing the issue with escaping the multi word keywords