fix catalog dispatchers, WiP