import.sql fix; imports optimization