Fix [p and ]p

Those maps are not perfect for now, but work.