refactor queryId when it should be layerId