performance improvements: added db indexes