Minor refactoring in database reading
Fixed help text