957890 - fixed duplicate unit listing in the applicability report and performance improvement fix to avoid loading unnecessary units