I've got exactly the same issue. I couldn't figure out why some of the toolbar search values were being cleared and some not – now I know why!

Any thoughts/workaround would be much appreciated