case_name select fix
Merge pull request #5097 from lwyszomi/improve_ordering_fix

case_name select fix