code clean up EntityToQueryConverter