Fixed again filtering based on permissions