[FIXED JENKINS-18604] Simpler to just add the ones that are favorite

- Simplifies the code and fixes the bug: double win!!!