Moderator Component, Some change in restricting Query