Split request types into A, AAAA and SRV. Also added wildcard support