Fix layer lookup based on prefix rather than URI