Updated package name and fixed filter calls