add filter out non-entities