fix filter calls
rename association