dev: Added complete/incomplete filtering for export to query instead of filtering the results