Add missing settings for Match Query