fix routing and PSR controller