FLUID-5251: Changed index of condition expander from git status to if/else shorthand format