Further updates to stop blank params being sent