21417 - Fix for errors on screens without advanced search widgets