Reformat code. Simplify config. See #675
Query by Id works via the repository. Query derivation doesn't since it side steps the DataAccessStrategy. Closes #675