More tuning for PREP2 data-service