Small changes, preparing a little for sorting by different attributes.