Fix AST namespace import
Switch all query parts to multi-fields match (will be used later)