Minor bug

In addition, I unrolled the allowed content types to make it a little easier to scan through them. Is there a way to optimize the type checking?