Bug fixes on Model filtering