add asset sorting and fix