Location history improvements

• Fixes some issues with forward history being erased too early
• Fixes a possible out of bound access

Been using it since a couple of days and things seem better.