fix warning
sort changes
fix check duplicated