now deals with 'hidden' fact types much better