100% agree with the OP, something simple like he suggested would be a great fix.