small tweaks for filtering system