Fixed code blocks for filtering