Added custom queryset object to replace current criteria search