Improve behavior of toast valueid identification