fixed sort & current
added current