rewrote queries from bean to entity