Update match to allow / with base
Replace extract globals with viewsVars