new regex double check and added id to site object