Hot swap flow query for similar with additional arguement - Windmill