Remove ref to 404 test, do not discard tags from empty tags