Fix extra_fields -> _as conversion

Obviously I forgot to commit some changes. This should fix the failing Travis CI builds.
Use a dict to store select parameters

This cleas up the code a bit, and makes it possible to check whether the clone is complete.

Fix #3