correct theme datasets query, and fix a few tests