Changes to index table and map popup