Fix Primary FQAN extraction