- fixed some raw queries