Adjusting output shortcodes to match wiki and be more symantic. Making the field selection logic and field output code a bit more readable.