Fix updating of item type icon when changing types (broken by 6b7fe80)
Fix error when no results from regexp search
Merge branch '4.0' of https://github.com/zotero/zotero into multi-4.0
Bugfixes following merge