Update to ignore zeroes
Add some price fallback