Fixed broken features after the Sifter UI update

Fixes #21 and fixes #22