updates to fix catalog issues