Fixed Entity Factory

--Filters is not fixed.