Fixes issues with accordion rules being too specific. Regression caused by #599