naming fixes, added in the filter to be used (forgot before)
naming fixes, added in the filter to be used (forgot before)