Almost fixed all completion issues with spaces