Routes fixes
Working tasks