add support for missing indexing and (basic) header