FW filter parser updates