fix #3663: changed and updated sort keys