updated handler route handling