Improve suffix rule detection