Switching classname matching to use indexOf allowing for additional classes to be added by UX