Hash index fixes