changes to make catalog queries also work for operationmetada