Minor UI improvements
Minor bugfix to 'SimpleYear'
Adding support for quantum type-based criteria