resolve issue with non-repository entities being listed