changes for jdhenke's uap assertion search