changed query with select thing and seperated that