Support commands like <br cmd param>, fix join grammar