Thanks drxx -- and when I starting tracking down the thematic items it became clear that was the right thing to have done. I enjoyed this puzzle, but if it could be improved slightly it would be by just tightening up the wording of the rubric a little bit.
I would think that discussing or clarifying the rubric should fall within the 'gentle hints' that some who jump on people for crossing a line have maybe forgotten are also permissible here. I don't like to go looking in the Other Place until I've finished, unless I really get stuck, because it's difficult to unsee what you've seen one you've seen it, notwithstanding everyone's commendable efforts to be subtle!
Is Banjaluka a new setter? I can't see him on the list. If this was a first contribution then I think it was an impressive one.