several fixes to create site flow