catalogqueries now do a proper parsing and subsistution of parameters other than the container. will be further enhanced in the future