Completed switch to sorting by score