Adding more controls to FilterEntities