Fixing retire securities disappearing and reducing filter options on investor side