Filter now included in final query, #9
Removed debug