Fixed CR case and disabled omnicomplete