Moved message text to resources file
Added the FormatQueryOption class