Fixes warehouse catalog query issues.