Applied changes from Extend - Firefox should work fully