Project tweak
Performance tuning for AWS DB queries