Fix route priority
Fix listeners