Fixed support for query strings in nav-current matching.
Merge pull request #1503 from pjackson28/v3.0

Fixed support for query strings in nav-current matching
Resolved merge conflict.