merged with category branch
fix database helper concurrency issues