Drop UnsuportedException and improve rule search