FIX unnecessary query to csubs avoided, unit test passing