general routes fixes