this shouldn't be short-circuited
more HTML building fixes