query cleaned up on name