Moved waterfall to separate function
Importer doesn't freeze, but search and filter are not prepared yet - needs pagination
Notes