Fixed issues with filtering by commonName, name, etc where there are multiple elements. CP NEEDED