break verify down a bit and add in type and url checks (bug 858614)

For @kumar