performance improvments

v1.2 for Nokia Store