Refactor more listeners (filter, gui)