Making extension work with baz pages too