Card position doesn't update on other types of update
Fix a few more sorting bugs