Fixed hang on boot
Fixed filter on restrictions