Fix list items count, revert switch fix as it broke currencyEdit form