Support more URL matches. Thanks, Snabe.