Clean imports, add query to US front