Added wildcard record check