Remove unused imports
Use the proper domain to query filter