Added better extract handling on the index.html