Maintain separate query args for connector and context in list table