NOJIRA: apply UCJEPS-512 fixes to this search portal code