Swapped places indexBy and condition in accordance with EBNF