additional bounded -> finite changes

because keys might come out in random order (that's why it was marked as SKIP). I now sort keys and have unskipped it.