Fixed queries, picks calculator

Fixed some queries to use joins rather than "where" statements. Also
changed the picks calculator after reports of issues with disabled picks
when total was 45.0.