Improved badges dropdown event