adding criteria join query one to many
clean up