Handle differences between OBA Discovery API and OBA Realtime API
More slight UI adjustments