Improve data retrieval of factor subtypes

When getting factorsInContext for the selected ICModel, we need to queries to get the factor subtypes. This should be able to achieve in one single query.

Now done with these queries: related-factors-to-factor-by-ICModel.sparql.template.handlebars factor-subtypes-from-factor-names.sparql.template.handlebars

We should be able to do it just within the first query?