Removed unneccesary COUNT query