Better (still ugly) intent routing