fixed named queries