Trim search query so we dont end up with trailing +