DEICH-6202 - Fixed focus trap config

To avoid focusing back on original element in list filter when collapse state changes due to a click outside the component. Some code cleanup around filter naming. Closes DEICH-6202