Map query & index missing data and performance fix