Restored support for all -wildcard commands