removed redundant query and connect path to current location