Fixed wrong routes -> functions combinations