Merge pull request #530 from za/master

add site:id common-columns