attempt to fix #11 by running more granular catalog queries.