Fixed apply routing and controller logic