#385 Several fixes on current price indicator