Improves error/loading handling in the variants list