Attempt to improve themes query.