clone filtering and tree collapsing fix
clone queries and filtering