Snikolov/fix routes