[#18] Handle basic subsheets better