The FIXME can be removed, right? It seems to me that there is already an index for st_x(site) and st_y(site)