Fix #5 and tighten up logic for ETSY007