Improve current route detection