Fix bug with key ordering in finds