haystack 2.x compatibility
fix haystach index setup for 2.x
merge conflict
merge with oxys-net