Buttoning up compatibility

Updated getByFolder method to work with buttoning-up branch