Fixed the metrics creation from facts and attributes to use nonextended ...

...notation to speed things up significantly