Fixed auto_expand property for JOIN and CONNECT