improved generic route search