added locality_id to components form