Moved more elements to filters