ISPN-3247 Cleared query module