fix annotation and user routes