Fix type selection. Now works on both us/world tabs
Refactor year selection bindings

Multi-year queries not yet supported