Added server-side merchant filtering