named query clash fixed
small clean up