Merge branch 'hotfix/2013-07-05-incorrect_caching'
enhanced code
Merge branch 'hotfix/fix-search_filter.js' into develop