Fix #437 #435

I can change but that's what's being used on other pages. Additionally,
this should never happen via the html but I rather have checks than assume.
Do you want me to change?