Changed some configurations around in the context mappings