sports searching works
fixed merge conflicts