Fixes #5702 - CV index call now respects environment_id correctly