sort goals by points and goal fill fix