refactor fixture selection + add catalog condition