Fixes: #2741 systems plugin needs to be adapted to new listing feature