Feature #5157 - Fixing some Web Services problems