some search fixes + mt940 support
added TODO's