I am trying to format thesis citations in the bibliography as follows:

Bjorndal, K.A. 1979. Nutrition and grazing behavior of the Green Turtle, Chelonia mydas, a seagrass herbivore. Ph.D. Dissertation, University of Florida, Gainesville, Florida, USA. 73 p.

Saumure, R.A. 1997. Growth, mutilation, and age structure of two populations of Wood Turtles (Clemmys insculpta) in southern Québec. M.Sc. Thesis, McGill University, Montréal, Québec, Canada. 70 p.

Here is the code that I have set-up so far:

<macro name="container">
<choose>
<if type="article-journal article-magazine" match="any">
<group delimiter=" ">
<text variable="container-title"/>
<group delimiter=":">
<text variable="volume"/>
<text variable="page"/>
</group>
</group>
</if>
<else-if type="thesis">
<group delimiter=", ">
<text variable="genre"/>
<text variable="university"/>
<text variable="city"/>
<text variable="country"/>
</group>
</else-if>
<else>
<text variable="container-title"/>
</else>
</choose>
</macro>

However, I cannot seem to get the "genre" to display (i.e., the thesis type [M.Sc. Thesis or Ph.D. Dissertation] do not appear).

And, secondarily, what code is recommended to get the number of pages displayed as above for this reference type? I played around with several options in this container macro, but nothing worked - the number of pages (without p.) kept displaying after the title but before the rest of the container despite that the code was sequential.

Would it be better to set-up a pages macro or...? Aside from the journal article page display above, I use pages as part of chapters as follows:

<macro name="chapter-info">
<group delimiter=" ">
<choose>
<if type="chapter paper-conference" match="any">
<group delimiter=" ">
<label text-case="capitalize-first" variable="page" form="short"/>
<text variable="page"/>
<text term="in" text-case="capitalize-first" font-style="italic"/>
</group>
</if>
</choose>
<text macro="editor"/>
</group>
</macro>

Thanks!

Matt