[0.3.7] - Fix error with Collection::sort and be more consistent with Model Ids and Collections