Add Where object
improve OrderBy