New DB change - clubid in most tables
some fixing