What about also allowing 30041 alone?

I guess that already forces you to have a structure selection interface.