Fixes issues with queries containing =
Query fixes for v3 and add delete on invoice service