Some fixes for adding dynamic fields support to FAQ item.