Added time option to track query and the map