Filter Quotes Fixes