fixed filter logic; adding domain models