refactored a bit; fixed an issue where searching reset filters
refactored a bit; fixed an issue where searching reset filters

ndoit/huginn,ndoit/fenrir,ndoit/fenrir,ndoit/fenrir,ndoit/fenrir,ndoit/huginn,ndoit/huginn,ndoit/huginn