Fix for Issue #19 and Honor Haystack update_index defaults to avoid issues