Some fixes for index crawler, not working though...