Issues with Encomendas page fixed