Fix ID selector matching