FIX: decimal issues weren't being searched properly and giving errors