fix safari sorting
Fix ordering issues
wip
Kinda working!