Outlet Emty filds check, some updates