Remove all underscores from query paramkeys and fix wait sound