svg: use builtin search
Merge branch 'staging'