Test new query pattern