add restrictionQueryHandling