Tweaks to research and index