Better management of NSFW content, which will come in handy for #7