Improve display sorting