change queue and fix wildcards [ci skip]