Improved app performance, fixes #37