Index things properly now.