Updating filters, other minor tweaks