Also tidied up the URL code, and added some tests for the
subcategory tags, which were painfully lacking.