Fixed manual queries being used without parsing objects