Updates to fix problems in WSA searches