Fixed another oversight in the generation of the lists which was defaulting to Provider rather than taking the model from settings.