Update ModelWrapper
Fix filter