CROWDCON-4 Fixed validation query to handle groups better