NTFY-22 Replace required queryValidator

This function needs to be implemented. I'll keep it around for now