restored pollquery mapping just for next release. Refs #409