Fixing #244 - supporting same question in diffrent locality