Url-encode + and ?
Move macros to vim.hrl and format for legibility