Finally get per-merchant pages working properly