fixed a findAll bug. started code for Query conversion to model