Merge pull request #113 from simod/1.4

fix queryset
fix test
move the query on ResourceBase