Small refactoring RelatedQuerySet
Add fk support