Make specs tolerant to DB default selection order