Fixes for COMPARE and SEARCH.