Added support for "fill type" questions