Expand shorthand and un-quoting

- Instead of unquoting Ti/Titananium/Alloy-values, simply unquote all
quoted values containing dots (and no spaces)
- Unquote quoted values inside queries
- Rewire some shorthand-mechanics to make more sense
- Add option for query-value shorthands
Instead quoting all Ti/Titanium/Alloy values, quote all unquoted values
containing dots
Cleanup