Add core module and use it to fix quick filters

Add core module and use it to fix quick filters #2050