Yes, don't get your hopes up too much on a companion upgrade. The companion will be far down the list assuming that you did this due to companion having no status. I think if companion has any status, they will clear at their level/window and not your level. (I think this is still the case)