Fix Trade filter errors
Merge branch 'core' of https://github.com/achamely/omniwallet into core