Resolve index bug + start with dates