Switched to raw filtering for ref