fixed sorting issues
fixed sorting issues