remove hardcoded + regex the id