fix for REV-701 (bulk search and replace); other small fixes