Added support for filtering steps by clusterId and stepStates.