Exact match query works correctly, fixed return bug, added some clauses
3 files changed