I fixed your site_node problem for a client last week, and it should be fixed on that branch.
I'll add it to HEAD too in just a minute.