Improved figure answers validation