Feature/multilayer querier issue 121

At that point, only small tweaks should be needed so converting this to a PR.