added livetracking button & query opts