using sets now in models instead of filter
updated queries