Wildcard event comparison and bug fixes