Removed Django 1.6 dependencies
Improved logic in ProductQuerySet