added state and country id to geo data, moved more prepared statements to compile time