BRANCH 4.2-DEV: turned off automatic icon generation (too slow).  Made
keyword search use "keyword" mode in simple search