Moved filter to array