Filter/comment tweaks