Rephrase to work with signature added as well as new question

Supports opengovernment/product#27