t1961: Improve FACT support in Perguntus