Source select and filter select now in same tree. Removed all borders.