Use SimplePointLayer for indexing (#633)