safer query for toolbarfix