indexes and contents fixes