fix: better regexp + fix firfeox issue