SolrRequest refactor WIP

Whilst addressing some issues, like #38. WIP.
Space inside } missing.