Fix routing by using HistoryLocation