Update the sorting to not have to call the search twice.  Reduces load time a bit.  Still want to do some more here.