Fix plugin break after DOM change and use wildcard subsearch for a little more resiliency