improve @import's matching