Addressed performance issues revealed by #173 by creating place-based indexes

(See also #196)