Update Fx product search regex and add tests.