Updated to sort entities on teapot index page