Fixed conformance issue with selects