Few tweaks to reduce cpu usage while filters are not used