updated query's to handle original field of DB