Fixed support for query strings in nav-current matching