Fix air mask, finish regex and wildcard support