Added None to sortion and ordering enum fields